Merge "Snap for 8261789 from c4bba9390f6e634a52c0a35dcef886726a436489 to main-cg-testing-release" into main-cg-testing-release