Merge "Fix comparison between port numbers in match"