Merge "Remove basic_auth strategy"