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