CL - Ranging beacons and updated assignments
CL: Merge local