[ros-diffs] [tkreuzer] 45332: More macros and fixes