Merge "Don't use concurrent MQ when instrumenting" into main