Merge "Move synchronous generateChallenge to implementation-specific classes"