2694029: Reroll MR 24 for 2.x branch

Geoffrey Robertsrequested to merge
issue/seckit-2694029:2694029-flood-control-2.x into 2.x

Closes #2694029

Merge request reports