repair public list
Migrate with broken DB
Merge remote-tracking branch 'upstream/master' into next