Merge changes from 1.6.0 branch back to patch.