Merge end-of-December changes from HEAD to u2_10_12_branch.