Pulling in changes from upstream (ros-i version)