Issue #8756 by tuj: Added unique id