t242 - Adding default values, for if the gateway exists.
Merge remote branch 'origin/7.x-3.0-qa' into 7.x-3.0-qa