Merge "Fix CombinedMessageQueue for ravenwood" into main