CHEF-3237 - Incorporated latest review comments.