Merge branch 'ss/user-manual'