[ros-diffs] [hyperion] 37785: Merge r37254-r37781 from trunk