WIP: Production release #6

Draft
fr wants to merge 40 commits from dev into master
36 changed files with 1174 additions and 52 deletions
Showing only changes of commit a1cff8417a - Show all commits