Merge "Add a protected broadcast for FDR" into tm-dev