Merge "Fix issue where clock scale would be wrong"