Merge branch 'fix_cfg' into 'master'

fix for the get_config_files

See merge request !2
4 jobs for master in 1 minute and 14 seconds (queued for 2 seconds)