Merge "Support optional parameters for CSLocalAgentCreationTests" into main