Fixes #<issue_number_goes_here> (it's a good idea to open an issue first for discussion)
[ ] Tests and linter pass
[ ] Code coverage does not decrease (if any source code was changed)
[ ] Appropriate docs were updated (if necessary)