Bugfix/715 merge

[yakky]

Description

Merge #716 with required code changes

References

Fix #715 Fix #716

Checklist

• [x] I have read the contribution guide
• [x] Code lint checked via inv lint
• [x] changes file included (see docs)
• [ ] Usage documentation added in case of new features
• [ ] Tests added

[yakky]

Merging as is, updated requirements will follow in a future PR