Merge pull request #2856 from alexrp/profiler-fix-sem