fix/1921-heard-consumers
main
Claude-Session: https://claude.ai/code/session_01NcbgfFSnn24M3GcqttoU7i