Merge "Change profiler file name parsing option"