Merge pull request #2069 from rmillner/TC222

Merged by openshift-bot