Merge changes from Hanson Robotics