Merge pull request #1691 from TheBlueMatt/2022-08-dust-retry