Merge branch 'SecExp-EdictJSification-conflictReportCompression' into 'pregmod-master'

Sec exp edict jsification conflict report compression [tested and ready to be merged]

See merge request pregmodfan/fc-pregmod!10108