Merge branch 'docs-5.0-fix' into docs-next

Pick up Arnd's fix here as well.