[CUST-169] Backport of case [MONDRIAN-2128].