SOS-1408

CE changes. Please backport to 6.1.x