Migrate changes upstream