(cherry picked from commit 23a202519cb1d8704a0b4294d8d13a224efb1a74) Signed-off-by: Domen Kožar <domen@dev.si>