ENG-6260 more progress against regressions