Merge "Reduce broadcast timeouts used during the test runs." into main