Revert "Merge branch '218012-vulnerabilities-are-incorrectly-marked-as-resolved-in-master' into 'master'"

This reverts merge request !37937