Merge "Allow BAL from CredentialManager" into main