Merge "Snap for 11456215 from 45b8a858049e77a81b1414629e1222250e62a342 to 24Q2-release" into 24Q2-release