backport changes
Merge branch 'v.0.4.0-branch'