Merge branch 'doc/4.8-fixes' into docs-next