Resolve "Defense v2"

Closes #1694

See merge request main/Sumatra!1461

sumatra-commit: 4a62bcf06d97d3e826230d7067b02bf8f033c531
2 jobs for master in 4 minutes and 21 seconds (queued for 2 seconds)