SOS-1847

For master