[GIT PULL] Clock changes for v2024.04