merge in oc-release history after reset to 4762bce4c4a8992202d154d0d64db6935a5903f2