Merge branch 'backport-3.24-doc-ctest_test-output-control' into doc-ctest_test-output-control