Merge branch 'release/2.2.4' into develop
Bug-Fix Map-View
Merge branch 'develop'