Merge branch 'bw/path-doc'