Merge v2023 and v2022 branches

Branches have diverged due to a wrong commit, fix the issue in order to have the same version in both releases.

Signed-off-by: Walter Lozano walter.lozano@collabora.com