GATEWAY-3451
Merge pull request #381 from bhumphrey/GATEWAY-3445

GATEWAY-3451