[ros-diffs] [greatlrd] 22986: putting back Christoph_vW patch that was revert by me