Merge "Removes recovery" into 24D1-dev