SOS-1945

for ee-6.2.x