Merge "Define toolbox.recovery" into main