Merge "SamplingProfilerIntegration and SamplingProfiler improvements (3/3)"