Moved the controller list out so it can be included elsewhere (cherry picked from commit 24007b00b2a5e9d09d953db79a24dd51b78e598b)
2023-05-19T14:22:35