Merge branch 'release/0.4.1' into develop