KRACOEUS-7778 : Fix ST caused by changes to S2SForms
Merge pull request #571 from blackcathacker/s2sform_change

KRACOEUS-7778 : Fix ST caused by changes to S2SForms