SOS-1896

For master