Merge branch 'sphinx-info' into release-3.12

Merge-request: !2146