Merge "Reset field translation"