Merge "Add a test for a multihoming configuration" into main