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