Issue #2257699 by katbailey: Support the new fixed targeting rules