Merge "Trying to fix intermittently stuck unit tests" into release-1.1.0