SOS-1881

For master