Merged cookbook update from 3.5.