Merge branch '8-7-stable' of gitlab.com:gitlab-org/gitlab-ce into merge-ce-87-stable

15 jobs for merge-ce-87-stable