Merge pull request #1346 from TheBlueMatt/2022-03-clones