Merge branch 'refs/heads/CHEF-3694'

* refs/heads/CHEF-3694:
  Fix "CHEF-3694" warning