Merge "Trying to remove waiting for broadcasts" into tm-dev