Merge remote-tracking branch 'osmlab/map-ui'