Backport changes from !64801 (merged), and !64948 (merged) into 13-12-stable-ee
for 13.12.7-ee
.
Does this MR contain changes to processing or storing of credentials or tokens, authorization and authentication methods or other items described in the security review guidelines? If not, then delete this Security section.
@gitlab-com/gl-security/appsec