Merge branch 'hotfix/0.0.3.4'
Merge remote-tracking branch 'upstream/master' into develop
setup ready