Merge branch 'wk/user-manual' into maint