Merge branch 'hotfix/2.1.2'
Sync with oauth2 2.1.6.
Merge branch 'hotfix/2.1.3' into develop