Merge "Snap for 11992464 from 72682c829fac8c16dbd6db9695b5620e59ca2c31 to emu-35-1-release" into emu-35-1-release