Merge branch 'CHEF-4117'