Merge branch 'authentication-challenge' into case-insensitive-map