Partial fix for bug 25273

[ng0]

Added a phase to substitute some paths.
To move forward with the rest of the bug I need input on the questions asked in 
the bug report thread, this as a first review.