Merge nephila develop into develop-4

[fsbraun]

Description

Describe:

• Content of the pull request
• Feature added / Problem fixed

References

Provide any github issue fixed (as in Fix #XYZ)

Checklist

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