Merge pull request #1015 from ORCID/PublicClientFixes

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

Round # 2
Round # 4