Merge branch 'long-life-oauth-tokens' into 'develop'