Merge "[CrashRecovery] Separating out required files" into main