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