[ros-diffs] [akhaldi] 70397: [0.4.0] * Merge rapps fixes by Thomas Faber in revisions 70339 and 70340.