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