merge in oc-release history after reset to fd7ca5eb7dc1fc653e08a70b816143034b8777aa