SOS-1376 Rebased