Refs #9711. Adjusted system test for PoldiMerge
Merge branch 'feature/9711_refactor_poldi_merge' into develop