Merge remote-tracking branch 'upstream/main' into fix/port-parse
#11490 -
Commit 30c3e6c14e pushed by jccit
fix(resolver): port parser does not handle leading ':'
#11113 -
Commit 2fdbc43bca pushed by jccit