Merge "Drop redundant ofPort check"