Co-authored-by: Gunnstein Lye <gunnstein.lye@ibexa.co>
(cherry picked from commit 5ccf2b57e5c021462071e8bc58b6f9a59cde5c6c)