Merge pull request #15899 from jefferyto/addrwatch-fixes
authorRosen Penev <redacted>
Thu, 15 Jul 2021 02:21:35 +0000 (19:21 -0700)
committerGitHub <redacted>
Thu, 15 Jul 2021 02:21:35 +0000 (19:21 -0700)
addrwatch: Various fixes


Trivial merge
git clone https://git.99rst.org/PROJECT