Make max_waiting: :infinity actually work

Merge request reports