Merge branch 'hotfix/0.3.1'
Merge branch 'release/0.4.0'
Ensure times are in local zone
Merge branch 'hotfix/v0.4.1' into dev