[backport] PRs 429, 435, 442