Merge "BUG-1590: introduce PathArgument.toRelativeString() and use it"