Rebased changes for Machinekit SDK