use delegate listener instead of on
Merge branch '1029-participants_errors' into staging