Merge branch 'release4.16.0'