Merge "unknown error 'filerevert-badversion'"