Merge "Fix NPE in *GenerateChallengeClient" into sc-dev