fix #3592
Merge branch 'release' into develop