Add support for protocol agnostic paths
Merge commit '50cb6cdb2767be6acdc09ec30a6021103e4e28ea'