Merge "Fix failing robotest"