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