Update defaults.yaml
Merge branch 'master' into new-defaults
Merge branch 'new-defaults'