Merge branch 'nd/sorted-builtin-command-list'