Merge branch 'fix/oauth-page-responsiveness' into 'develop'