Co-authored-by: Shubham Gupta <gshubham@microsoft.com> (cherry picked from commit e3cd627069c7d35b4638af3f2299a248eeca3923) (cherry picked from commit ccb711544b13d4f52846dc5d4ab2491c010a2b9f)
Co-authored-by: Shubham Gupta <gshubham@microsoft.com> (cherry picked from commit e3cd627069c7d35b4638af3f2299a248eeca3923) (cherry picked from commit ccb711544b13d4f52846dc5d4ab2491c010a2b9f)