Merge "WA for stuck tests in docker images"