original commit
Merge https://github.com/gorohoroh/JetBrainsOnMaps