[ros-dev] Patch up for testing