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