SOS-1967

For master