Update for 117
Merge branch 'stable'