Thread change ref #4378
Merge pull request #4380 from jasondhales/waterThread_4378

Thread change ref #4378