Merge "Add flag for recoverability_detection" into main