Fix regression configs to pass validation
Merge branch 'daley', remote-tracking branch 'origin'