[ros-diffs] [pschweitzer] 48274: Get back r47063 & r47960 reverted by r48273