Merge branch 'refs/heads/release/v0.0.4'
Merge branch 'refs/heads/master' into develop