Refs #10516 Handle single runs appropriately
Merge branch 'feature/10516_support_multiple_runs' into develop