CE upstream - Wednesday

Closes gitlab-ce#39732, gitlab-ce#39798, gitlab-ce#38372 et gitlab-ce#39377

See merge request gitlab-org/gitlab-ee!3308