Merge "Fix storperf path"