Merge "Add timeout parameter to generateChallenge"