Merge "PNF Simulator - fix fileFormatType"