Merge "Fix erroneous protected-broadcast check" into pi-dev