Merge "configure port format" into oc-dev