Merge branch 'server-side-chunking'

Merge the server side chunking into the master branch