sh19910711 Merge branch 'release/0.0.4' into develop