backport for gitlab-ee!2869
What does this MR do?
backport
Why was this MR needed?
-
Has been reviewed by Backend -
Has been reviewed by Database -
Conform by the merge request performance guides -
Conform by the style guides -
Squashed related commits together