Restore !94820
Restore !94820 (merged) which was reverted with !105612 (merged) in order to fix gitlab-org/quality/engineering-productivity/master-broken-incidents#287 (closed).
Restore !94820 (merged) which was reverted with !105612 (merged) in order to fix gitlab-org/quality/engineering-productivity/master-broken-incidents#287 (closed).