GATEWAY-3247 - ready to be merged.

This is ready to be merged.