Merge branch 'pw/convert-pathname-substitution'