Merge "Refactoring recovery related code" into main