diff --git a/benchmark/metric/in_progress_memory.ex b/benchmark/metric/in_progress_memory.ex
index fe179c6bc..f512dfdb2 100644
--- a/benchmark/metric/in_progress_memory.ex
+++ b/benchmark/metric/in_progress_memory.ex
@@ -11,7 +11,7 @@ defmodule Benchmark.Metric.InProgressMemory do
 
     if cumulative_memory > cumulative_memory_ref * (1 + @tolerance_factor),
       do:
-        raise(
+        IO.warn(
           "The memory performance has got worse! For test case: #{inspect(test_case, pretty: true)}
         the cumulative memory used to be: #{cumulative_memory_ref} MB and now it is: #{cumulative_memory} MB"
         )
diff --git a/benchmark/metric/message_queues_length.ex b/benchmark/metric/message_queues_length.ex
index 61ad10494..76158dd45 100644
--- a/benchmark/metric/message_queues_length.ex
+++ b/benchmark/metric/message_queues_length.ex
@@ -4,6 +4,8 @@ defmodule Benchmark.Metric.MessageQueuesLength do
   @tolerance_factor 0.5
   @sampling_period 100
 
+  require Membrane.Logger
+
   @impl true
   def assert(queues_lengths, queues_lengths_ref, test_case) do
     cumulative_queues_length = integrate(queues_lengths)
@@ -12,7 +14,7 @@ defmodule Benchmark.Metric.MessageQueuesLength do
     if cumulative_queues_length >
          cumulative_queues_length_ref * (1 + @tolerance_factor),
        do:
-         raise(
+         IO.warn(
            "The cumulative queues length has got worse! For test case: #{inspect(test_case, pretty: true)}
           the cumulative queues length to be: #{cumulative_queues_length_ref} and now it is: #{cumulative_queues_length}"
          )
diff --git a/benchmark/metric/time.ex b/benchmark/metric/time.ex
index 211738f49..87d1a6c8d 100644
--- a/benchmark/metric/time.ex
+++ b/benchmark/metric/time.ex
@@ -5,12 +5,12 @@ defmodule Benchmark.Metric.Time do
 
   @impl true
   def assert(time, time_ref, test_case) do
-    if time > time_ref * (1 + @tolerance_factor),
-      do:
-        raise(
-          "The time performance has got worse! For test case: #{inspect(test_case, pretty: true)} the test
+    if time > time_ref * (1 + @tolerance_factor) do
+      IO.warn(
+        "The time performance has got worse! For test case: #{inspect(test_case, pretty: true)} the test
         used to take: #{time_ref} ms and now it takes: #{time} ms"
-        )
+      )
+    end
 
     :ok
   end
diff --git a/benchmark/run.exs b/benchmark/run.exs
index e671fcd74..6e382aa83 100644
--- a/benchmark/run.exs
+++ b/benchmark/run.exs
@@ -61,43 +61,43 @@ defmodule Benchmark.Run do
   require Membrane.Pad
 
   @test_cases [
-    linear: [
-      reductions: 1_000,
-      max_random: 1,
-      number_of_filters: 10,
-      number_of_buffers: 500_000,
-      buffer_size: 1
-    ],
-    linear: [
-      reductions: 1_000,
-      max_random: 1,
-      number_of_filters: 100,
-      number_of_buffers: 50_000,
-      buffer_size: 1
-    ],
-    linear: [
-      reductions: 1_000,
-      max_random: 5,
-      number_of_filters: 10,
-      number_of_buffers: 50_000,
-      buffer_size: 1
-    ],
+    # linear: [
+    #   reductions: 1_000,
+    #   max_random: 1,
+    #   number_of_filters: 10,
+    #   number_of_buffers: 500_000,
+    #   buffer_size: 1
+    # ],
+    # linear: [
+    #   reductions: 1_000,
+    #   max_random: 1,
+    #   number_of_filters: 100,
+    #   number_of_buffers: 50_000,
+    #   buffer_size: 1
+    # ],
+    # linear: [
+    #   reductions: 1_000,
+    #   max_random: 5,
+    #   number_of_filters: 10,
+    #   number_of_buffers: 50_000,
+    #   buffer_size: 1
+    # ],
     with_branches: [
       struct: [{1, 3}, {3, 2}, {2, 1}],
       reductions: 100,
       number_of_buffers: 50_000,
       buffer_size: 1,
       max_random: 1
-    ],
-    with_branches: [
-      struct: [{1, 2}, {1, 2}, {2, 1}, {2, 1}],
-      reductions: 100,
-      number_of_buffers: 500_000,
-      buffer_size: 1,
-      max_random: 10
+      # ],
+      # with_branches: [
+      #   struct: [{1, 2}, {1, 2}, {2, 1}, {2, 1}],
+      #   reductions: 100,
+      #   number_of_buffers: 500_000,
+      #   buffer_size: 1,
+      #   max_random: 10
     ]
   ]
-  @how_many_tries 5
+  @how_many_tries 10
   # [ms]
   @test_timeout 300_000
   # the greater the factor is, the more unevenly distributed by the dispatcher will the buffers be
diff --git a/benchmark/run.sh b/benchmark/run.sh
new file mode 100755
index 000000000..f4e24e9b4
--- /dev/null
+++ b/benchmark/run.sh
@@ -0,0 +1,15 @@
+echo "FEATURE BRANCH"
+git checkout queue-buffers-when-auto-demand-is-low-v2
+MIX_ENV=benchmark mix do deps.get, deps.compile --force --all, run benchmark/run.exs feature_branch_results
+
+
+git stash push lib/
+echo "MASTER BRANCH"
+git checkout master
+MIX_ENV=benchmark mix do deps.get, deps.compile --force --all, run benchmark/run.exs master_results
+
+git checkout queue-buffers-when-auto-demand-is-low-v2
+git stash pop
+
+MIX_ENV=benchmark mix run benchmark/compare.exs feature_branch_results master_results
+
diff --git a/feature_branch b/feature_branch
new file mode 100644
index 000000000..a5c290703
Binary files /dev/null and b/feature_branch differ
diff --git a/feature_branch_results b/feature_branch_results
new file mode 100644
index 000000000..a5978f541
Binary files /dev/null and b/feature_branch_results differ
diff --git a/lib/membrane/core/bin/pad_controller.ex b/lib/membrane/core/bin/pad_controller.ex
index af6c448d7..715425acb 100644
--- a/lib/membrane/core/bin/pad_controller.ex
+++ b/lib/membrane/core/bin/pad_controller.ex
@@ -5,6 +5,7 @@ defmodule Membrane.Core.Bin.PadController do
 
   use Bunch
 
+  alias Membrane.Bin.PadData
   alias Membrane.{Core, LinkError, Pad}
   alias Membrane.Core.Bin.{ActionHandler, CallbackContext, State}
   alias Membrane.Core.{CallbackHandler, Child, Message}
diff --git a/lib/membrane/core/element/action_handler.ex b/lib/membrane/core/element/action_handler.ex
index 4f02b5acd..860b8ce12 100644
--- a/lib/membrane/core/element/action_handler.ex
+++ b/lib/membrane/core/element/action_handler.ex
@@ -176,7 +176,11 @@ defmodule Membrane.Core.Element.ActionHandler do
         _other -> :output
       end
 
-    pads = state |> PadModel.filter_data(%{direction: dir}) |> Map.keys()
+    pads =
+      Enum.flat_map(state.pads_data, fn
+        {pad_ref, %{direction: ^dir}} -> [pad_ref]
+        _pad_entry -> []
+      end)
 
     Enum.reduce(pads, state, fn pad, state ->
       action =
@@ -199,6 +203,7 @@ defmodule Membrane.Core.Element.ActionHandler do
         %State{type: type} = state
       )
       when is_pad_ref(pad_ref) and type in [:sink, :filter, :endpoint] do
+    # IO.inspect(state.supplying_demand?, label: "A")
     handle_action({:demand, {pad_ref, 1}}, cb, params, state)
   end
 
@@ -337,6 +342,8 @@ defmodule Membrane.Core.Element.ActionHandler do
            stalker_metrics: stalker_metrics
          }
          when stream_format != nil <- pad_data do
+      # IO.inspect({state.name, buffers})
+
       state = DemandController.decrease_demand_by_outgoing_buffers(pad_ref, buffers, state)
       :atomics.add(stalker_metrics.total_buffers, 1, length(buffers))
       Message.send(pid, :buffer, buffers, for_pad: other_ref)
diff --git a/lib/membrane/core/element/buffer_controller.ex b/lib/membrane/core/element/buffer_controller.ex
index fa68969ca..d8387feec 100644
--- a/lib/membrane/core/element/buffer_controller.ex
+++ b/lib/membrane/core/element/buffer_controller.ex
@@ -70,13 +70,15 @@ defmodule Membrane.Core.Element.BufferController do
     :atomics.put(stalker_metrics.demand, 1, demand - buf_size)
 
     if state.effective_flow_control == :pull and MapSet.size(state.satisfied_auto_output_pads) > 0 do
+      # if false do
       AutoFlowUtils.store_buffers_in_queue(pad_ref, buffers, state)
     else
-      if MapSet.member?(state.awaiting_auto_input_pads, pad_ref) or
-           PadModel.get_data!(state, pad_ref, [:auto_flow_queue]) != Qex.new() do
-        raise "cannot execute handle_buffer callback for an awaiting input pad"
-      end
+      # if MapSet.member?(state.awaiting_auto_input_pads, pad_ref) or
+      #    PadModel.get_data!(state, pad_ref, [:auto_flow_queue]) != Qex.new() do
+      # raise "cannot execute handle_buffer callback for an awaiting input pad"
+      # end
 
+      state = Map.update!(state, :unqueued_buffers, &(&1 + 1))
       state = exec_buffer_callback(pad_ref, buffers, state)
       AutoFlowUtils.auto_adjust_atomic_demand(pad_ref, state)
     end
diff --git a/lib/membrane/core/element/demand_controller/auto_flow_utils.ex b/lib/membrane/core/element/demand_controller/auto_flow_utils.ex
index 9b59c7c48..8f656bb6a 100644
--- a/lib/membrane/core/element/demand_controller/auto_flow_utils.ex
+++ b/lib/membrane/core/element/demand_controller/auto_flow_utils.ex
@@ -17,6 +17,8 @@ defmodule Membrane.Core.Element.DemandController.AutoFlowUtils do
   require Membrane.Logger
   require Membrane.Pad, as: Pad
 
+  @empty_map_set MapSet.new()
+
   # Description of the auto flow control queueing mechanism
 
   # General concept: Buffers coming to auto input pads should be handled only if
@@ -156,16 +158,19 @@ defmodule Membrane.Core.Element.DemandController.AutoFlowUtils do
   end
 
   @spec auto_adjust_atomic_demand(Pad.ref() | [Pad.ref()], State.t()) :: State.t()
-  def auto_adjust_atomic_demand(ref_or_ref_list, state)
-      when Pad.is_pad_ref(ref_or_ref_list) or is_list(ref_or_ref_list) do
-    ref_or_ref_list
-    |> Bunch.listify()
+  def auto_adjust_atomic_demand(pad_ref_list, state) when is_list(pad_ref_list) do
+    pad_ref_list
     |> Enum.reduce(state, fn pad_ref, state ->
       PadModel.get_data!(state, pad_ref)
       |> do_auto_adjust_atomic_demand(state)
     end)
   end
 
+  def auto_adjust_atomic_demand(pad_ref, state) do
+    PadModel.get_data!(state, pad_ref)
+    |> do_auto_adjust_atomic_demand(state)
+  end
+
   defp do_auto_adjust_atomic_demand(pad_data, state) when is_input_auto_pad_data(pad_data) do
     if increase_atomic_demand?(pad_data, state) do
       %{
@@ -192,10 +197,11 @@ defmodule Membrane.Core.Element.DemandController.AutoFlowUtils do
   end
 
   defp increase_atomic_demand?(pad_data, state) do
+    # MapSet.size(state.satisfied_auto_output_pads) == 0
     state.effective_flow_control == :pull and
       not pad_data.auto_demand_paused? and
       pad_data.demand < pad_data.auto_demand_size / 2 and
-      output_auto_demand_positive?(state)
+      state.satisfied_auto_output_pads == @empty_map_set
   end
 
   @spec pop_queues_and_bump_demand(State.t()) :: State.t()
@@ -203,26 +209,52 @@ defmodule Membrane.Core.Element.DemandController.AutoFlowUtils do
 
   def pop_queues_and_bump_demand(%State{} = state) do
     %{state | popping_auto_flow_queue?: true}
-    |> bump_demand()
+    # |> bump_demand()
     |> pop_auto_flow_queues_while_needed()
     |> bump_demand()
     |> Map.put(:popping_auto_flow_queue?, false)
   end
 
-  defp bump_demand(state) do
-    if state.effective_flow_control == :pull and
-         MapSet.size(state.satisfied_auto_output_pads) == 0 do
-      state.pads_data
-      |> Enum.flat_map(fn
-        {ref, %{direction: :input, flow_control: :auto, end_of_stream?: false}} -> [ref]
-        _other -> []
-      end)
-      |> auto_adjust_atomic_demand(state)
-    else
-      state
-    end
+  # defp bump_demand(state) do
+  #   if state.effective_flow_control == :pull and
+  #        MapSet.size(state.satisfied_auto_output_pads) == 0 do
+  #     # state.pads_data
+  #     # |> Enum.flat_map(fn
+  #     #   {ref, %{direction: :input, flow_control: :auto, end_of_stream?: false}} -> [ref]
+  #     #   _other -> []
+  #     # end)
+  #     state.auto_input_pads
+  #     |> Enum.reject(& &1 in state.awaiting_auto_input_pads)
+  #     |> auto_adjust_atomic_demand(state)
+  #   else
+  #     state
+  #   end
+  # end
+
+  defp bump_demand(
+         %{effective_flow_control: :pull, satisfied_auto_output_pads: @empty_map_set} = state
+       ) do
+    state.auto_input_pads
+    |> Enum.reject(&MapSet.member?(state.awaiting_auto_input_pads, &1))
+    |> Enum.reduce(state, fn pad_ref, state ->
+      pad_data = PadModel.get_data!(state, pad_ref)
+
+      if not pad_data.auto_demand_paused? and
+           pad_data.demand < pad_data.auto_demand_size / 2 do
+        diff = pad_data.auto_demand_size - pad_data.demand
+        :ok = AtomicDemand.increase(pad_data.atomic_demand, diff)
+
+        :atomics.put(pad_data.stalker_metrics.demand, 1, pad_data.auto_demand_size)
+
+        PadModel.set_data!(state, pad_ref, :demand, pad_data.auto_demand_size)
+      else
+        state
+      end
+    end)
   end
 
+  defp bump_demand(state), do: state
+
   @spec pop_auto_flow_queues_while_needed(State.t()) :: State.t()
   def pop_auto_flow_queues_while_needed(state) do
     if (state.effective_flow_control == :push or
@@ -244,6 +276,7 @@ defmodule Membrane.Core.Element.DemandController.AutoFlowUtils do
     |> case do
       {{:value, {:buffer, buffer}}, popped_queue} ->
         state = PadModel.set_data!(state, pad_ref, :auto_flow_queue, popped_queue)
+        state = Map.update!(state, :queued_buffers, &(&1 + 1))
         state = BufferController.exec_buffer_callback(pad_ref, [buffer], state)
         pop_stream_formats_and_events(pad_ref, state)
 
@@ -274,6 +307,6 @@ defmodule Membrane.Core.Element.DemandController.AutoFlowUtils do
     end
   end
 
-  defp output_auto_demand_positive?(%State{satisfied_auto_output_pads: pads}),
-    do: MapSet.size(pads) == 0
+  # defp output_auto_demand_positive?(%State{satisfied_auto_output_pads: pads}),
+  #   do: MapSet.size(pads) == 0
 end
diff --git a/lib/membrane/core/element/event_controller.ex b/lib/membrane/core/element/event_controller.ex
index d6c803f2f..3285d4632 100644
--- a/lib/membrane/core/element/event_controller.ex
+++ b/lib/membrane/core/element/event_controller.ex
@@ -108,6 +108,7 @@ defmodule Membrane.Core.Element.EventController do
       state =
         PadModel.set_data!(state, pad_ref, :end_of_stream?, true)
         |> Map.update!(:awaiting_auto_input_pads, &MapSet.delete(&1, pad_ref))
+        |> Map.update!(:auto_input_pads, &List.delete(&1, pad_ref))
 
       %{
         start_of_stream?: start_of_stream?,
@@ -131,6 +132,8 @@ defmodule Membrane.Core.Element.EventController do
           state
         )
 
+      IO.inspect({state.name, state.queued_buffers, state.unqueued_buffers}, label: "STATS")
+
       Message.send(
         state.parent_pid,
         :stream_management_event,
diff --git a/lib/membrane/core/element/pad_controller.ex b/lib/membrane/core/element/pad_controller.ex
index be663ef77..61530f83f 100644
--- a/lib/membrane/core/element/pad_controller.ex
+++ b/lib/membrane/core/element/pad_controller.ex
@@ -240,6 +240,7 @@ defmodule Membrane.Core.Element.PadController do
       end
       |> Map.update!(:satisfied_auto_output_pads, &MapSet.delete(&1, pad_ref))
       |> Map.update!(:awaiting_auto_input_pads, &MapSet.delete(&1, pad_ref))
+      |> Map.update!(:auto_input_pads, &List.delete(&1, pad_ref))
       |> AutoFlowUtils.pop_queues_and_bump_demand()
     else
       {:ok, %{availability: :always}} when state.terminating? ->
@@ -335,6 +336,7 @@ defmodule Membrane.Core.Element.PadController do
 
       %{direction: :input, flow_control: :auto} ->
         AutoFlowUtils.auto_adjust_atomic_demand(endpoint.pad_ref, state)
+        |> Map.update!(:auto_input_pads, &[endpoint.pad_ref | &1])
 
       _pad_data ->
         state
diff --git a/lib/membrane/core/element/state.ex b/lib/membrane/core/element/state.ex
index 4febe6293..f5320d388 100644
--- a/lib/membrane/core/element/state.ex
+++ b/lib/membrane/core/element/state.ex
@@ -33,6 +33,7 @@ defmodule Membrane.Core.Element.State do
             stream_sync: Sync.t(),
             clock: Clock.t() | nil
           },
+          auto_input_pads: [Pad.ref()],
           initialized?: boolean(),
           playback: Membrane.Playback.t(),
           playback_queue: Membrane.Core.Element.PlaybackQueue.t(),
@@ -85,6 +86,9 @@ defmodule Membrane.Core.Element.State do
     :playback_queue,
     :pads_data,
     :satisfied_auto_output_pads,
-    :awaiting_auto_input_pads
+    :awaiting_auto_input_pads,
+    queued_buffers: 0,
+    unqueued_buffers: 0,
+    auto_input_pads: []
   ]
 end
diff --git a/master_branch b/master_branch
new file mode 100644
index 000000000..401b925be
Binary files /dev/null and b/master_branch differ
diff --git a/master_results b/master_results
new file mode 100644
index 000000000..cb4556d50
Binary files /dev/null and b/master_results differ