(M-01721): Separate C2-5644, JX1-2E57, AJ1-20300 and HD-JC1455; unify