Create marshaller per request, rather than reusing
Merge branch 'mbst-9893-more-granular-uploads' into stage