Merge branch '2021-09-28-regression-fixes'