Issue927

Closes #927 (closed)

Please check the following before asking for a review:

• All the modified code is covered.
• Docstrings reflect the code changes.
• Type hints reflect the code changes
• Add a changelog fragment for all user visible changes.