4.0.2 fix 561

[pgesposito]

PR Checklist

Please check if your PR fulfills the following requirements:

• You add a commit message
• Tests for the changes have been added (for bug fixes / features)
• Docs have been added / updated (for bug fixes / features)

PR Type

What kind of change does this PR introduce?

[ ] Bugfix
[X] Feature
[ ] Code style update (formatting, local variables)
[ ] Refactoring (no functional changes, no api changes)
[ ] Build related changes
[ ] CI related changes
[ ] Documentation content changes
[ ] Other... Please describe:

What is the current behavior?

Issue Number: #561

What is the new behavior?

Does this PR introduce a breaking change?

[ ] Yes
[ ] No

Other information