Rebase Production Release with present changes from Openshift