First commit for OpenShift support