Merge "Snap for 8294919 from 975afb7f55d41f5655c17e8867744940622ee160 to main-cg-testing-release" into main-cg-testing-release