Merge pull request #730 from TheBlueMatt/2020-09-no-rescan