Update A::H with changes from core