Issue #1955378 by skek, Darren Oh, claudiu.cristea, David_Rothstein: Return same derivative token with path or URI.
Merge pull request #410 from hellomrcat/d7-path

Issue #1955378 by skek, Darren Oh, claudiu.cristea, David_Rothstein: Return same derivative token with path or URI.