Release 2292

#2289 was released yesterday but the migrations failed on prod so we had to reverted the release (#2291).

This is another attempt to release the changes, but this time I've split the db structure and data changes to two separate migrations.