SOS-1806

for master