Merge branch 'encyclopedia-api' into 'v0.8.4'

Encyclopedia merge

See merge request !137
8 jobs for v0.8.4 in 20 minutes and 1 second (queued for 1 second)