resolved gating issues
Merge pull request #557 from abhinavc/master

Reolved gating issues