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