Merge "Combined Legacy and Concurrent Message Queues" into main