Merge branch 'refs/heads/electronicmap-core' into electronicmap
Merge branch 'origin/electronicmap'