release 0.4 ends
Merge branch 'release/0.4' into develop