Merge pull request #5189 from alexrp/profiler-sample-type-field