Fix broken master

2.065 branch does not have its own changes - all of commits should be
(modified) cherry-picks. So, the merge result should be exact same as the
git-head.