Merge branch 'stable'
Bump up core version
Merge branch 'rel-2.8.117' into stable