[MONDRIAN-1726] cherry pick