Release 164 bugid 112445 update maps kamilkoterba

Rpeating commits after temporary revert