Merge branch 'docs-3.19' into docs-next