SOS-2366 for master