SOS-1832

For master