Merge branch 'feature/185_add_account_edit_events' into staging