❗ This MR is based on !6725 (merged) and !6731 (merged)
For gitlab-com/gl-infra/scalability#2767 (closed)