Reopening: I need to triple check the migration for this on different DB to not reproduce the problems we had with 15.10.2.