Making change work for prior to 0.8 as well as 0.8 and above
Adding a manual test for clustered to demonstrate fix with different node versions