Merged cookbook improvement from 3.2.