Merge branch 'ss/user-manual' into maint