Fixes to ML - ignore defense when only one opponent that we attack
Merge branch 'dev' into dev-mac