SOS-1889

For master