Merge 'config-files' to 'master' branch