Part 1 of Card 536
Merge pull request #1915 from lnader/stage

Merged by openshift-bot