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