[ros-diffs] [hbirr] 16669: Merge r16633:16634 from trunk. This fix prevents from corrupting the message queues.