Merge "Snap for 11456215 from 34c969d4c57677230612b885348960ef7eea7afa to 24Q2-release" into 24Q2-release