[ros-diffs] [weiden] 13576: 1. a few previous mode fixes