Merge "Always load the current clock when it is first connected" into main