Merge "Snap for 5079223 from 3244a91356ba5d3c5e21143c51ef0491628c85cf to emu-3.0-release" into emu-3.0-release