(M-03172): Unify U-00020B48, MJ032041 and KOSEKI-036760; add