Refs #9711. Merging new data files

As explained in #10090, the measured chopper speed is sometimes a bit off on new data files. That's why the speed has to be cleaned up for now.
Merge branch 'feature/9711_refactor_poldi_merge' into develop