## TODOs: - [ ] If addressing an issue, a commit message mentions `Fixes issue #` - [ ] Changes to fish usage are reflected in user documentation/manpages. - [ ] Tests have been added for regressions fixed - [ ] User-visible changes noted in CHANGELOG.rst