Added missing gateway parameters.
Merge branch 'develop' into intrinsic_security