Patching gateway

SD-65 : implement session expiration

Patching gateway fix 2.