Merge branch 'tb/config-copy-or-rename-in-file-injection'