Merge pull request #1427 from abhgupta/abhgupta-dev

Merged by openshift-bot
avoiding unnecessary mongoid calls