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