Merge "Disable ClockOptionsProvider" into rvc-dev