CC-51: Merging Chef Contributions.