merge in oc-release history after reset to 904cf685507edf016af0068fb2b5c2499b146e54