Merge "Slightly easier debugging of missing inputs to copy-file-to-target"