Merge "Fix the empty checkpoint timeout."