Optimizations for congestion control

Equivalent to sbws#40130 (closed)