Merge "Validating non-empty authority and accountType"