(JSP-5628): Add S1-6484 and S2-6484; add `<-original' for J0-4048.