Merge "improve the format of locale argument when calling recovery"