fix #4422
Merge branch 'release' into develop