CLC-1386 Master branch addendum - allow Eli fix to run more than once without exploding
Merge pull request #732 from ctweney/clc-1386-master

CLC-1386 Master branch addendum