Merge models on development

Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.