SOS-1467 Revertting SOS-1130. Need to rethinking the feature requirement