Merge branch 'hotfix/0.3.4'
Merge branch 'release/0.4.0'
Fixing missing property
Merge branch 'hotfix/0.4.1' into develop