Code

Merged ID generation from branches/2.5