Rebased migrations #35