Merge "Add busy wait for consume() call"