SOS-1561

Please backport to 6.1.x, ee-6.1.x and ee-6.1.20.