Merge pull request #155 from zmelnick/feature-direct

GATEWAY-3052
Merge pull request #158 from zmelnick/feature-direct

bug fix for broken unit test
Merge remote-tracking branch 'origin/feature-direct' into feature-direct