[CUST-160] [MONDRIAN-1998] Backport for 3.6.X