(M-20921): Separate J83-605F, C3-2D7E and J90-605F; add