Merge "Minor fixes for CrashRecovery modules" into main