[ros-diffs] [weiden] 16416: some %x -> %p fixes