Merge branch 'terminology-rieks' into 'master'

Terminology updates (work in progress)

See merge request !10
1 job for terminology-rieks in 2 minutes and 7 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #45872
build

00:02:07