[PARENTS-2027] PSAT/NMSQT Update