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