Merge "Changing SimpleBroadcastHandler so that it's disabled by default to fix stabil...