cismap/cismap-commons#64
Merge branch 'dev' into feature/37-verdis-app-mode-layer