Merge "Snap for 8466163 from 97a3595670c570ce34014f682c6d02a870b95594 to main-cg-testing-release" into main-cg-testing-release