KRACOEUS-7065 moving some s2s code into s2s
Merge pull request #55 from leoherbie/move_s2s

KRACOEUS-7065 moving some s2s code into s2s