Merge "Remove clock id check and change them to properties of ClockConfig" into main