Reestablish baseline for migrations (for 37.x)

Already merged this into develop for s38 but also merging into s37 to make it easier to keep migrations in order.