Merge "Add p2 option in OpenLogicalChannel" into oc-dev