Removed `Local` from the pet name
Merge branch 'wip-2' into v4.11-stable