Add Profiling to trunk from r93681