Merge "Squash migrations"