[ros-diffs] [tkreuzer] 35696: enhance macros