Merge remote-tracking branch 'remotes/smcv/ready/openid'