Merge branch 'robot_testing' into hydro-devel