Merge "Allow multiple listeners for the same message type" into main