Manifest updated
Merge branch 'release/0.4.0dev'
Merge tag '0.4.0dev' into develop

0.4.0dev