New Release
Merge branch 'release/0.9.4' into develop