Ust 3647/dev/3664 add support for addresses

This looks like the same body as above, it must be possible to merge them using a new parameter.