Merge branch '49-annotations-with-constraints-to-entities' into 'develop'

Resolve "Annotations with constraints to entities" in destination module

See merge request !85