Cherry pick from d27d605394: Some streamlining of runconfigs handling