fix SEGV-case in a4fa7119d2
fix object IDs not being assigned randomly anymore
Merge branch 'release' into develop