Merge "Snap for 8496002 from d4d41c78f58488192807e10eefeb2bd10685ba27 to main-cg-testing-release" into main-cg-testing-release