Merge branch 'edition-fixes' into 'develop'

#86 Edition fixes

See merge request !80
1 job for develop in 16 minutes and 36 seconds (queued for 1 minute and 43 seconds)