Merge "Fix race condition is commitCheckpoint"