Backport v4.0.x

[sylvlecl]

Please check if the PR fulfills these requirements (please use '[x]' to check the checkboxes, or submit the PR and then click the checkboxes)

• [X] The commit message follows our guidelines
• [X] Tests for the changes have been added (for bug fixes / features)
• [ ] Docs have been added / updated (for bug fixes / features)

What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)

Features

Description

This backports evolutions and fixes from branch v4.0.x to main branch.