Merge branch 'auth-openid'