Merge "Allow leading spaces in path string (to keep behavior consistent)" into nyc-dev