SOS-1918

For Master