match core changeset c3762a5