Round # 2
Merging with latest master
Merge pull request #1013 from ORCID/PublicClientFixes

Round # 2