Implementing OpenShift-3958

Implementing OpenShift-3958