Wolf Variants Backport

Wolf Variants Backport

Backports wolf variants from 1.20.5

1,560
11