Mob 1532

@nandy-andy @RafLeszczynski @rogatty Please, review ;) DO NOT MERGE JUST YET
Ok, so we should probably look if we can do the same for create map messages.
//TODO ;)