Merge branch 'machtypes' into orion