merge in oc-release history after reset to 13275668c35135bf80e1c763db8578a63655898d