Merge branch 'develop' into release4.16.0