Merge pull request #797 from TheBlueMatt/2021-02-no-addr-order