machine groups
Merge branch 'enhancements'