CE upstream: Thursday

Closes gitlab-ce#31782, gitlab-ce#33529, gitlab-ce#32861, gitlab-ce#33483, #2525, gitlab-ce#31263, gitlab-ce#33403, and gitlab-ce#33106

See merge request !2137