Merge "Revert "Define linker.recovery"" into main