Merge branch 'CHEF-4117-10-stable' into 10-stable