Mob 1532

@nandy-andy @RafLeszczynski @rogatty Please, review ;) DO NOT MERGE JUST YET
Let's merge `MOB-1392-intmaps-extension` with the changes you've mentioned and do it properly :)