Merge branch 'ds/doc' into jc/fmt-patch