Fix false-positive with contextmanager missing cleanup (#9654) (#9657)

7 files changed