Round # 2
Merge pull request #1016 from ORCID/PublicClientFixes

Round # 2