Backport CHEF-5223 to 10-stable