SOS-1878

For master