resolve merge conflicts of eb48f49dd to oc-dev am: 7e37841e4f -s ours