Migrate changes from original fork