ignore the word "the" when sorting machine names
Merge branch 'enhancements'