Issue #3310801 by bojan_dev, m.stenta, e0ipso, KenowaX, Berdir: Add client_id field to the consumer entity