merge in oc-release history after reset to 0041452afda731ef70e55e4dd659410c161002bc