Switch between clocks analog/digital fix
Merge remote-tracking branch 'upstream/v1-train' into v1-train