Merge 1.6.1 changes to patch branch.