Resolve "Issue processing data with both schema + data"

Merged Amir Golparvar requested to merge 1627-issue-processing-data-with-both-schema-data into develop

Merge request reports