Merge "Fixed StorPerf references"