Merge branch 'terminology-rieks' into 'master'

update on 'objective'

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