Merge branch 'zecke/features/acc-list'

Integrate the change and see how it is going. The unit tests
for the NAT look good so we might not have regressions.