Add field templates from upstream.
Update brand name setting.
Add taggability to location