Fix for bug 977224
Merge pull request #2953 from abhgupta/stage_977224_fix

Merged by openshift-bot