Merge "Revert^2 "Utils required for CrashRecovery module"" into main