Merge "Snap for 8547012 from 49ada8cca63e0f16c9893bedac17af6497a11197 to main-cg-testing-release" into main-cg-testing-release