Merge branch 'stable'
Updates for 117 release