Updated submodules with latest sources
Merge yaml files with default strings.