Changes merged from openshift