fix #4110
Merge branch 'release' into develop