Merging with master
For es, fr and zh: Adding all keys in english by default
Merging with latest master changes