Keep original source/target paths in the result
Merge pull request #1537 from MohammadYounes/f5

Keep original source/target paths in returned result