Migrate 5.4