Merge "Ignore port when matching with wildcards" into rvc-dev