Ported Chicken chunks

Ported chicken chunks from 1.6 repo