merge in oc-release history after reset to f3ded8f6b9b04b2fc2006e4c141a1517a6107c0d