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