Consolidate migrations

This solves issue 5163
It needs to be in this file too.