Update to latest virtualrobotix for_merge branch