Fix address-kit configuration #40

Merged parmentf merged 10 commits into tdm:master from tdm:fix-address-kit-config on 13 Sep 2023