SOS-1924

For master