CLC-1111 Followup - sleep only on the current node
Merge pull request #629 from ctweney/clc-1111

CLC-1111 Followup - sleep only on the current node