Backport fixes from default branch.