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