Merge "[CrashRecovery] Adding helper methods" into main