Preserve backend data in result set even if it's in-memory
Merge branch 'master' into gh-pages