Merge origin/develop into develop:
- messages_en.properties
- messages_es.properties