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