Merge pull request #1131 from TheBlueMatt/2021-10-upstream-dust