Merge pull request #6255 from wtgodbe/targetingpack