Output documents server side
Output documents
Merge branch 'master' into outputdocs