SOS-2376

For Master. ee-6.2.x and 6.2.10. Support will backport to 6.1.x soon