Merge pull request #1036 from jeenu-arm/fix-ordering

Fix alphabetic ordering