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