Add update when associating address
Merge remote-tracking branch 'origin/testing' into testing