Merge pull request #840 from jkczyz/2021-03-rescan-logic