Merge "Snap for 8547012 from 72df2a58a3a03a6ca7b3a484de46da90cfadf403 to main-cg-testing-release" into main-cg-testing-release