AI-499 : avoid random id for application-defined objects
Merge remote-tracking branch 'origin/version4' into version4