Merge "freezer: handle exception in locks file format" into sc-dev