SOS-1834

For master