Merge branch 'mc-commit-test-6282' into 'master'

See merge request gitlab-org/security/gitlab!2196

Changelog: security