Merge "Hang up original swapped connection" into oc-dr1-dev