KRACOEUS-7719 : fixing bugs related to equals comparison, fixing s2s opportunity bug