Merge remote-tracking branch 'origin/rebuild/auth-identity-foundation' into rebuild/auth-identity-foundation