Merge branch 'terminology-rieks' into 'master'

Updates on governance (minor work on terminologies)

See merge request !36
1 job for master in 3 minutes and 20 seconds (queued for 3 seconds)