Merge branch 'release/0.3'
Merge branch 'release/0.4'
Fixed some values having wrong key
Merge branch 'hotfix/0.41' into develop