Regrade improvements: student ID option, robustness (to Prod)

Same as #2263