Merge "Fix robotests"