Add support for mixing groups and plain tokens in profiling #1635