Merge branch 'release/0.41' into develop