merge in oc-dr1-release history after reset to a3ee5679edbd5c2e89a079437b999629d2b3bffc