Merge "Update Parser to use ContentLanguage"