Merge branch 'master' into usermanual-integration