More methods to outputhandler in server package.
Merge remote-tracking branch 'origin/master'