Merge "Add refresh broadcast id checks" into tm-dev