Update for 116
Merge branch 'rel-2.10.116' into stable
Merge branch 'stable'