Merge "Add support for pathSuffix"