Added infinite iterations handling when consuming messages
Removed old trace