CONN-1299: Updated with review comments. Added PassThru to gateway.properties