Better id generation

Merged s78456 requested to merge better-id-generation into develop

Merge request reports