Merge "test db migration"