Merge remote-tracking branch 'dev/12-8-stable' into 12-8-stable

See https://gitlab.com/gitlab-com/gl-infra/delivery/issues/694 for more
information about this merge.

VERSION

-12.8.1-ee
+12.8.1