Mapwork branch merged