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