Merge "Add REENROLL_REQUIRED to IFace" into sc-dev