Merge "Add configuration overrides to dump tests" into main