Merge "Allow the use of filenames when traking code paths for profiling"