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