Merge "Snap for 11702928 from 645dfcf7a4fe2bc6166a1cd53b626af37a890b96 to emu-34-2-release" into emu-34-2-release