Apply contents of 35336bf and Correct translation