Fix s360 vulnerabilities on m18

Merge request reports