Merge "Fix "TypeError: format requires a mapping" in waiters"