[x] All code has been formatted using our config (make format)
[x] Any new API features or modification of existing behavior is covered as defined in our test plan
[x] The changelog has been updated under the ## Unreleased header, using the appropriate sub-headings (### Added, ### Removed, ### Fixed), and the links to the appropriate issues/PRs have been included
Re-creation of #1528 from a local branch.
Pre-review checklist
make format)## Unreleasedheader, using the appropriate sub-headings (### Added,### Removed,### Fixed), and the links to the appropriate issues/PRs have been included