Merge "Snap for 8294919 from 2c0e20b987c4c7f5725aa4508cfb7e3c023ad061 to main-cg-testing-release" into main-cg-testing-release