fix issue 653: reduce UUID object generation
4 files changed