resolve merge conflicts of 037808f59 to oc-mr1-dev