SOS-1574

Please backport only to CE 6.1.x. This is CE only