Merge branch '2021-10-05-general-updates'