'Merge' old map version from 'premapfix' branch