Merge "Fix "form/from" typos in comments"