Merge "Snap for 8400509 from 65edb2d72a27de75a6393b8daa35c39e309f5a72 to main-cg-testing-release" into main-cg-testing-release