Show switch on map
Merge branch '0019-switch-on-map' into develop