Merge pull request #1115 from TheBlueMatt/2021-10-expose-addr-vec