Merge "Fix idle maintenance wrt checkpoint check" into qt-dev