Expose plan_file_basename as an optional input to ModelPair types
Merge branch 'fireteam' into gb_master