Merge "Merge branch 'stable-2.16' into master"