(BC-8BE5): Unify S-2230; add `<-original' for J0-5729.