Merge "Allow recovery mount metadata" into rvc-dev