Merge "Fix bug where preEnroll returned int instead of long"