Cherry-picking commits from master to 2.066 branch (for beta6)