Merge branch 'security-290955-fix' into 'master' See merge request gitlab-org/security/gitlab!3034 Changelog: security