Merge branch 'hotfix/maps_fix' into develop
added created by message
Merge branch 'develop'