Merge "Snap for 8433432 from 19b26a5488bdd2e2da341cb267ac56ea709cc725 to main-cg-testing-release" into main-cg-testing-release