Merge pull request #2982 from BanzaiMan/dev/hasari/c157

Merged by openshift-bot