Merge "Allow recovery mount metadata"