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