Wild Update Backport

A backport of the Wild Update to 1.12.2