This PR needs to be applied to the Start Branch. https://github.com/AzureCosmosDB/cosmosdb-nosql-copilot/pull/91