merged with openshift version