Merge "Add CompatChange for local network matching" into main