SOS-1952

For master