Merge branch 'doc/4.2' into docs-next