SOS-2094

PR to ee-6.2.x is different.