Merge branch 'stf606-draft' into 'stf606-final'

fix schema for nested attributes in some data models after validating through Swagger UI

See merge request !9