Merge "Fix retry_bad_request() context manager"