Made generation of 'id' external
Merge remote-tracking branch 'remotes/origin/master' into durable