Security is now in line with gateway commit 5e0163ebf70151cb88dcdeaa4d4d73214d70112b
36 files changed