Merged from openshift repository.