Round # 4
Merge pull request #1018 from ORCID/PublicClientFixes

Round # 4