fix #4103
Merge branch 'release' into develop