Merge "Modify clock message buffers for improved logging" into main