Merge branch 'lv/add-doc-working-tree' into maint