Merge "(bug 38110) provide a way to separate out schema changes"