allow additional metadata for machines
Merge branch 'enhancements'