Change output data format of FE to be common between 2S and PS

Merged David Gabriel Monk requested to merge common-data-format into master

Merge request reports