Merge "Snap for 8364388 from f3f3e5a1f5566ec35e8bd6ccafd19d5693231ac8 to main-cg-testing-release" into main-cg-testing-release