SOS-1928

For master