upstreamMastercopy - modify