Merge "Snap for 11456215 from 56d5bc999edbb8189b914a7b9643afb0f0b1902a to 24Q2-release" into 24Q2-release