Merge branch 'refs/heads/t/doc-improvements'