Merge branch '264441-remove-enable-special-references-for-vulnerabilities' into 264441-revert-special-references-for-vulnerabilities