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