Merge branch '2022-01-08-further-important-updates'