Merge branch 'mauro-doc' into docs-next