Added all guest export
Merge branch 'json-export-fix'