Fixed the id creator to be longer than 15 characters to avoid collisions
Merge branch 'refs/heads/3.0/develop' into 3.0/production