"Merged" master, in advance of implementing the new "Good"