Combine Challenge Registration APIs
Merge branch 'master' into merge_challenge_registraion_api