Merge "Do not block broadcast on handler processing" into main