Merge branch 'terminology-rieks' into 'master'

updates on framework

See merge request !7
3 jobs for master in 4 minutes and 2 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #43679
build

00:01:31

 
  Deploy
passed #43680
pages

00:02:31

passed pages:deploy

00:00:01