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