sort api machine_details by name
Merge branch 'enhancements'