SOS-1888

For master