Merge branch 'ontology' into 'dev'

ontology contains unit attributes

See merge request !140
3 jobs for dev in 1 minute and 23 seconds (queued for 2 seconds)