Merge "Fixing edge cases that @string references passed in path parts."