Merge "Fix robotests." into oc-dr1-dev