#1547

[joocer]

Thank you for opening a Pull Request!

Before submitting your PR, there are a few things you can do to help make sure it goes smoothly:

• Raise a bug/feature request or start a discussion, ideally before writing your code! That way we can discuss the change and the approach.
• Ensure the tests pass
• Ensure code coverage does not decrease (if any source code was changed)
• Appropriate docs and tests were updated (if necessary)

Fixes #1547