Update for 117 release
Merge branch 'master' into stable

Merge in master for 117 release