Merge "ConcurrentMessageQueue fix idle calculation" into main