Merge "Pause recovery when it ends with Shutdown" into main