[SP-1238] [CUST-160] [MONDRIAN-1998] Backport of these cases for 3.6.X