Merge branch 'release/0.9.4'
Merge tag '0.9.4' into develop

Release 0.9.4