SOS-1467

Reverting SOS-1130, becasue requirement needs to be re-defined.