Feature/409 address mgmt