SOS-1946

For master