Revert "Revert "Merge branch 'master-chef-11.10' into mainline-chef-11.10""

This reverts commit 9de709970400ef4c10e2a9deefdb70d23b3e3af8.