[BACKLOG-832] - Kitchen hangs on MacOS
Merge pull request #779 from rfellows/dev

[BACKLOG-832] - Kitchen hangs on MacOS