[ros-diffs] [hbirr] 16598: Merge r16567:16568 from trunk. This fix prevents from corrupting the message queues.