Merge "Several connectivity fixes" into main