Could probably merge this migration with the 657 one.