runtime: fix for thread safety issue during simultaneous use of stream tags and performance counters
Merge branch 'maint'
Merge branch 'master' into next