Merge "Fix unreadable clock" into qt-dev