Merge branch 'release/v0.4.40' into develop
quickfix
Merge branch 'release/v0.4.41'