Calculate actual avoidance before clamping to MAX_AVOIDANCE
Merge remote-tracking branch 'flare-engine/branch0.18' into branch0.18