This is a backport of !55 (merged) for apertis/v2023
Signed-off-by: Dylan Aïssi dylan.aissi@collabora.com