Merge "Snap for 8366858 from 11864eb9d96d78c533b193d12dc7cc0fb33af56c to main-cg-testing-release" into main-cg-testing-release