Experiment with absolute path prefixes
Manual merge from upstream