minor (#4106 and #4107)
Merge branch 'release' into develop