Cherry-picking commits from master to 2.066 branch (for the minor release 2.066.1)