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