Merge branch 'backport-sphinx-linkcheck' into sphinx-linkcheck