Inline substitute inside s:dirpath()
Merge branch 'vheon-refactoring' into refactoring