This is an automatic cherry-pick of 2439fcc3b6f553e1f3150f90a22aacbd3c346b08

The original PR was #266 with message:

Describe your changes

Please include a summary of the change, a relevant motivation and context.

Issue ticket number and link

• Fixes #(issue)

Checklist before requesting a review

• I have performed a self-review of my own code
• I have verified that the code builds perfectly fine on my local system
• I have added tests that prove my fix is effective or that my feature works
• I have commented my code, particularly in hard-to-understand areas
• I have verified that my code follows the style already available in the repository
• I have made corresponding changes to the documentation