Merge branch 'pre-auth' into basic_auth