Merge "Snap for 11456215 from 0764dad6b4c424ec9bd5dfee19d66ed7c786456f to 24Q2-release" into 24Q2-release