Merge "Made master connection expectations actually work"