(M-21729): Unify U-00024C13 and H7-B4A6.