[ros-diffs] [royce] 13012: fix variable cases