Merge "Move association revoke logic to AssociationRevokeProcessor" into main