changes from OpenShift