Merge branch 'security-435036' into 'master' See merge request gitlab-org/security/gitlab!3816 Changelog: security