Security issue import fixes

For #3568643

Merge request reports

Loading