fix #4082
fix #3754
changelog
Merge branch 'release' into develop