fix: Downmerge from main to dev#2021

Roopan-Microsoft merged 2 commits intodevAzure-Samples/chat-with-your-data-solution-accelerator:devfrom

mainAzure-Samples/chat-with-your-data-solution-accelerator:mainCopy head branch name to clipboard