SOS-1150

For master