[ros-diffs] [weiden] 33924: Improve IBandSite support a bit