BZ-10024: Fix issue on map
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap