migrating in other changes from pre-integration