Merge "Fix a failing robotest"