Merge "Do DbMigration if coming from a DB w/ version < 31" into main