Large commit...
Large commit
Merge branch 'object_templates'