Sorted controller list (cherry picked from commit 3174d0b97025376e4a7b6e881501a43472238e0e) (cherry picked from commit 507be6c3f819ad24b08eb3d28e7e14c9aeb6b60a)