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