Improvements on discovery consume condition. Introduced delayed_consume.