(M-37326): Unify S-8077; add `<-original' for J0-6D2F.