Fix for broadcast module
Merge remote-tracking branch 'upstream/master'