Fix electronic parsers

Merged Nathan Daelman requested to merge fix_parsers into develop

Merge request reports