KeyValue Type: Fix attempting to treat an array as a string
Merge remote-tracking branch 'origin/new_templates'