[MONDRIAN-1844]