Merge "Snap for 8547012 from 89efca4bd7f89ca5f332ca67ebcd73a1cfd2df61 to main-cg-testing-release" into main-cg-testing-release