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