Merge "New clock sync control loop."