Merge branch 'hotfix/0.41' into develop
More dynamic map symbolization
Merge branch 'release/0.42'