MONDRIAN-1771 - merging mongolap into lagunitas