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