Fix from robot testing and resolve merge

No match.