Merge branch 'bugfix/oauth-padding' into 'develop'