Merge "Snap for 7810574 from 74706659cf4ad0832dcc3aeec413d340f6214ab8 to main-cg-testing-release" into main-cg-testing-release