Merge branch 'stable-2.16' into stable-2.17