Merge branch 'ta/user-manual'