Merge "Refactoring metrics in CrashRecovery module" into main