Also addresses doc build failures documented in bpo-32200.
(cherry picked from commit 7324b5ce)
Co-authored-by: Julien Palard <julien@palard.fr>