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