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