Merged with Openshift