Merge pull request #2956 from rythie/develop

Fix profiling of benchmarked names like 'something_endpoint_end'