[CHEF-3029] Added some lines that have disappeared in the rebase
Merge pull request #1 from onddo/CHEF-3029-4

[CHEF-3029] Added some lines that have disappeared in the rebase