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