Merge "Snap for 7810574 from 33f14f66208fb55b5a69171d39541d32122d42dc to main-cg-testing-release" into main-cg-testing-release