Merge "Mark as recovery_available: true"