CE upstream

Closes gitlab-ce#33877, gitlab-ce#33594, gitlab-ce#33598, and gitlab-ce#27070

See merge request !2178