bpo-33649: More improvements (GH-9439)

(cherry picked from commit e247b46cba4f4d32ea96a15dbc36d73265171106)

Co-authored-by: Yury Selivanov <yury@magic.io>
2 files changed