FORGE-1112: Support paths with spaces