HCOLL-134 creates a new map based on the details that are sent to the map of builders
Merge remote-tracking branch 'origin/master'