Merge "Add/update plumbing for generateChallenge"