Rebased Clément Guidi's PR#1702 to master (without changes)

Commands used:
gh pr checkout 1702
git switch -c new-branch
git rebase master        # (no warnings, no conflicts)
git push

Signed-off-by: Bernhard Kaindl <43588962+bernhardkaindl@users.noreply.github.com>