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