Backport CHEF-5223 to 10-stable
Merge pull request #1594 from jaymzh/backport_5223

Backport CHEF-5223 to 10-stable