merge 2.8 fix for profiled nodes