Merge account-notify and extended-join client capabilities