Cherrypick forward 07ba2e and 3e5f, chicken 5 work