Merge "Snap for 8547012 from 109393404088be8703d0a9aa410f52211e81861c to main-cg-testing-release" into main-cg-testing-release