[PULL] clock changes for v2022.01-rc3