adding a event handler
Merge remote-tracking branch 'origin/addressMigration' into addressMigration