SOS-1900

for master