Set max lenght for entity id/uuid field
Merge remote-tracking branch 'origin/entity-maxlength' into HEAD
Fix meerge confilcts