SOS-1816

for master