Merge "Force stack dump to diagnose empty checkpoint timeout (2)."