KRACOEUS-7847 - Fixing s2s submission
Merge pull request #954 from shojmr/KRACOEUS-7847-3

KRACOEUS-7847 - Fixing s2s submission