Merge branch 'support/oauth' into 'develop'