Merge branch '2023-01-06-further-regression-fixes'