[TASK] Make sure copying works to symlinked targets
[MERGE] Merge remote-tracking branch 'upstream/master'