Merge "Prevent extra work on the same timestamp" into qt-dev