DISPATCH-834 Handle changing between address.prefix and address.pattern
3 files changed