Update develop branch with release-0.4