Merge "Snap for 8496002 from e2c4f0fcf4fd5cc2949046fc8f631e4d25003fd0 to main-cg-testing-release" into main-cg-testing-release