Merge branch 'release/v0.4.41' into develop
more fixes
Merge branch 'develop'