Standardized assemble data to JSON
Merge pull request #3432 from LaurentGoderre/complete-3428

Standardized assemble data to JSON