merge in oc-dr1-release history after reset to 4e574e982994b90447bee7609e7c1e7f9199253f